Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 16 Jul 2011 06:58:51 +0000 (23:58 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 16 Jul 2011 06:58:51 +0000 (23:58 -0700)
commit440aedba8a80cd2f5703a11250694dba4a525de5
tree1824001fbeb31a695e6880f355bd97ac2e12f0d2
parentf072c16ba9ccf401fabf3a0d430878130813f684
parent8e84045700ec8be4a0d8b92a46ebc72bc65c88f2
Merge from trunk.